merge with xen-unstable.hg

diff --cc xen/arch/ia64/xen/domain.c
Simple merge

diff --cc xen/arch/ia64/xen/xensetup.c
index 2eb56b5c8c169440013268943be00f81978a57b1,0f64691f4b7150d183e67a208b73a20957a5c371..3c35c674f5161772182ad6dc998446f3bca03516
--- 1/xen/arch/ia64/xen/xensetup.c
--- 2/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@@ -530,11 -508,12 +530,10 @@@ printk("num_online_cpus=%d, max_cpus=%d
      if (!running_on_sim)  // slow on ski and pages are pre-initialized to zero
        scrub_heap_pages();
  
 -printk("About to call init_trace_bufs()\n");
      init_trace_bufs();
  
-     /* Give up the VGA console if DOM0 is configured to grab it. */
 -#ifdef CONFIG_XEN_CONSOLE_INPUT       /* CONFIG_SERIAL_8250_CONSOLE=n in dom0! */
 -    console_endboot();
 -#endif
 +    if (opt_xencons)
-       console_endboot(cmdline && strstr(cmdline, "tty0"));
++        console_endboot();
  
      domain0_ready = 1;
  

diff --cc xen/include/asm-ia64/vmx.h
Simple merge